Skip to content

Conversation

@CalvinAllen
Copy link
Contributor

Summary

  • Stash all local changes (including built binary) before pulling with rebase
  • Pop stash after rebase, then add only manifest data and commit

Fixes "cannot pull with rebase: You have unstaged changes" error caused by the built manifest generator binary.

@CalvinAllen
Copy link
Contributor Author

/skip-changelog

@CalvinAllen CalvinAllen merged commit 5eb1a60 into main Jan 26, 2026
2 checks passed
@CalvinAllen CalvinAllen deleted the fix/ci/manifest-stash branch January 26, 2026 16:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Development

Successfully merging this pull request may close these issues.

2 participants